Merge with xen-ia64-unstable.hg
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Wed, 28 Mar 2007 09:41:53 +0000 (10:41 +0100)
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Wed, 28 Mar 2007 09:41:53 +0000 (10:41 +0100)

Trivial merge